Simple refactoring and format corrections.