Small refactor and removal of .gitignore