Cleaned up the pin scaffold