improved scaffolding snippets