begin refactoring
clean up files