refactoring
refactoring, simplify markup