Cleanned up Sacaffold