general cleanup of indentations, new lines at the end of the file and extra commas
Merge pull request #678 from lirantal/cleanup-indents-and-conventions

general cleanup of indentations, new lines at the end of the file and extra commas