Merge Cleanup

Cleaning up Joe’s mistakes. -_-