Cleanup whitespace, add TODO comments
WIP: start_time and end_time