Extract Markup class. Refactor names. Improve specs checking generated files