Refactoring to be coding style conform.