Use sane units instead of arbitrary constants