[CHORE] Tidies up a bit