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

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