cleaning up code, naming, rake files