Scaffolding out pins and cleaning it up a bit