Minor, minor code tidyup