Small code tidy up