minor refactor (mostly formatting)