Some Cleanup

As soon as you make your first commit, you always see something that
needs changing