Metric trait
Use metric and cleanup a bit
Cleanup return styles and others