code cleanup, comments