some light refactoring and code readability changes
some light refactoring and code readability changes

serracorwin/surveyor,risuiowa/surveyor,bricesanchez/surveyor,fhisamoto/surveyor,anitsirc/surveyor,markedmondson/surveyor,serracorwin/surveyor,bricesanchez/surveyor,Guestfolio/surveyor,markedmondson/surveyor,Guestfolio/surveyor,risuiowa/surveyor,HeHStudy/surveyor,lampo/surveyor,NUBIC/surveyor,alanjcfs/surveyor,blueboard/surveyor,bricesanchez/surveyor,HeHStudy/surveyor,blueboard/surveyor,NUBIC/surveyor,NUBIC/surveyor,blueboard/surveyor,HeHStudy/surveyor,Guestfolio/surveyor,bricesanchez/surveyor,markedmondson/surveyor,fhisamoto/surveyor,lampo/surveyor,alanjcfs/surveyor,risuiowa/surveyor,lampo/surveyor,fhisamoto/surveyor,blueboard/surveyor,alanjcfs/surveyor,anitsirc/surveyor,fhisamoto/surveyor,serracorwin/surveyor,risuiowa/surveyor,lampo/surveyor,alanjcfs/surveyor,HeHStudy/surveyor,anitsirc/surveyor,Guestfolio/surveyor,anitsirc/surveyor