Fix comments & code width