Just removed empty lines
More cleanup and formatting
Reformatting output