Fix comments, add some spaces