Progress class made clearer, erase duplicate functionality, split functions, fix formatting

This addresses issue #9.
It is some time ago, but I think only the result of modulo should be kept and assigned, such that one can get next only the hours, after the days have been "substacted".