organization and clean up

organization and clean up