small style improvements... I wish I'd started using google's R style guide years ago.