Moved Unit.valueOf to Value.convertTo for readability. Formulae refactored and getters added/removed accordingly