Refactor and git ignore