tidying and rearranging