trivial formatting
some reorganization