cleaned up files, added comments