Bit of cleaning up of recent changes