Made fixes from Adam's comments