cleaning up code and arrangement of project