Add spaces at the beginning of comments
Fix redundant self offenses