Refactored elements