Bit of cleanup for consistency