cleaned up scaffolding for pins