Applied Samay's code review feedback.