Code styles, refactoring.