Clean Up Part 1

Now that I know the thing actually works I need to do some serious
clean up