Cleaning this up a bit