Updates after review - change names to not include _, and update comments