Cleaned up code based on updated .gitignore