code cleanup - comments, package names