production tidy up attempt