improved formatting + minor ('low hanging fruit') refactoring