Cleaned up the PINs scaffold