Refactor/validations and cleanup#358

manirajyadav-1 wants to merge 2 commits intocodefordenver:mastercodefordenver/ideaLab:masterfrom

manirajyadav-1:refactor/validations-and-cleanupmanirajyadav-1/ideaLab:refactor/validations-and-cleanupCopy head branch name to clipboard