stable and tidy up