Further minor refacotring to address tagged comments