Refactored, fixed markup