Tidy it up a bunch - will now break in OSX