remove comments and modified indent