style changes suggested by jmartini