cleaned up organization