Cleaned up Pin Scaffold