comments & code cleanup - thomas