Code cleanup, working on .gitignore file