Cleanup

Code is finished and working. Last minute cleanup. I have a backup of
the git from before this push if need be