Clean up output; rename variable
Handle some error cases
Whitespace
Clear out old timing code