clean unused comments and do spacing