cleanup

code cleanup, adding notes