Cleaned up pins