Added Pins and cleaned