General: Refactoring of the code style.