refactoring element names, cleaning redundant elements