refactored elements