tidy up less code