refactored scaffolded markup