cleaned code and organization