added pins and cleaned them up