Tweak and clean up a bit