tidy up based on sensio insights