Tidying code and use statements