Cleaned up Scaffolding