Refactoring of some elements.