Fix use of measurement units, fix indentation