Applying changes according code review suggestions.