updated .gitignore, refactored after tests