Bit of tidy up spilt out into separate files