Minor refactoring

- Adding support for zero as a parameter