Cleaned up pin scaffold