added inches and cm plus more refactoring