Generic tidy-up

Moving from old style.