Another wee pretty refactor