I fixed Mark F's ugly C