Minor git upkeep and refactoring

Resubmitted because I didn't have an updated version of the master repository at first. oops.