address mdl comments on PR
condense code
remove commented out code & notes