Code-Style refactoring (!NOT_MERGEABLE_YET!)