Slight code tidy up