Feature/refactor markup rebased