formatting and removing useless comments