Polish
Apply eclipse formatting rules

Apply eclipse formatting rules to b2fe2dd9.

See gh-1751
Polish CLI init command

Rename a few classes and methods and extract some logic into helper
classes. Also change 2 char shortcuts to a single char.

Closes gh-1751