cleaned up, added comments, organized files