Bit of cleanup after last commit