cleaned up the code, added less files