Minor clean-ups around naming, unused namespace references and trailing whitespaces