remove comments and correct indent