Clean up convert methods