clean up

commenting and cleanup