Cleaned up Pins Controller