Cleaned up Scaffold