light refactoring and renaming of elements.