Refactor Hand Markup