cleaning up unit conversions