19736

stage 2 commit - cleanup on indents/comments to be committed post live test