Add git configuration files and minor refactor for clarity