Cleaned up an unholy befuckery