addressed TODOs from code pull request and cleaned up more of the whitespace conflicts