reposition some code for readability

baby steps to clean up code readability

all moved statements move over orthogonal code; code that neither
modifies values utilized by the statements, nor depends on values
modified by the statements.

Change-Id: I3ab85ad2b57b74716c88e6b7f17aca83689db79c
Reviewed-on: https://gerrit.instructure.com/31595
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>