Cleanup.
Preparations to display duration as hours and minutes if desired.
Cleanup of javadoc.