.gitignore updated
Refactoring and code cleanup