Switch to metric, started reformat to make unit testing easier