Cleand it up a bit