tidy up code time!!