Cleaning up a bit more