unit conversion is only applied in root node.
Code formating clean up.
Merge branch 'master' into dev