Implement some suggestions from review