cleaned up some files, refactoring