Refactored style issues.