Cleaned up Phevor a bit.