Some minor refactoring to respect our coding style.