Changes based on codereview feedback.