Adress code style issues.