tidy up design