Remove extra whitespace at line ends
Merge 24-hour estimation into the same script for easier maintenance