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

This addresses issue #9.