quick tidyup for readability