Small code tidyup