Formatting and removing extra comments