Minor style / code reformatting