refactor Wrapper elements