cleanup comments & code