cleaned up scaffolding