Refactored Xeditable