Changes based on review (#263)