Small tweaks after review w/Ben