Tidying and a bit of abstraction