Feature/refactor markup