Minor style changes, untested