tidied up assignment for submission