Simplifying conversions as per Mark suggestions