fix comment spacing, move if-body