Began touching up code for pull request