Refactor .element classes