Applying suggestions from previous comments