cleaned up organization kinda