code cleanup
organize imports
more cleaning up