Removed a bit of a mess