Cleaned up scaffolding for pins.