comments & code cleanup