more code cleanup and logical separation #3847
Merge pull request #4049 from openscholar/3847-form2

more code cleanup and logical separation #3847