Minor refactoring

- Adding support for negative numbers, to be used for 'diff' purposes