Clean up and stuff

Pirates like RUM!