cosmetic changes, removed some scaffolding