Cleaned up the pins scallfold