Some refactorings. NO_BREAKING_CHANGES