Do some minor cleanup.