Delete unnecessary comments and reformate some code