Improvements based on Carlos O. review