Fixes code review issues.