tidy up assigments