Clean up conversion a little bit