code cleanup, no func changes #3847
Merge pull request #4059 from openscholar/3847-form3

code cleanup, no func changes #3847