improves form
Merge pull request #1137 from noahc/R000576

improves form