Closes #49

- Just some clean up and tagging