Comments, cleanup & organization of code.