Remove comments and tidy