Incorporating @elemoine's review comments