Some opportunities for cleanup, as pointed out by leider