Removed useless comments and TODOs also formatted