Refactoring
removing unncecessary blank lines
New class for formatting options