better, cleaner code, numbers are now handled properly

parent 4ceee997
Pipeline #228 passed with stage
in 1 minute and 17 seconds