Tidy up, remove repetition.