astyle, some refactoring