Jehan's clean version of tito
Jehan's cleanup patch 2