A bit more code clean up.