refactoring
gitignore
clean up