cleaning up code, comments, file dir