Changes to code style based on feedback.