Completed tidy up