Fix comment spacing and canonized