Cleans up pull request 84. Tests passing