Refactors for style and clarity.

Extra empty line detected at body beginning.