Cleaned up pinouts