Futher minor cleanup