Making changes per @sharwell's review