suggestions and tidy up