Cleaned up in pins controller