* Clean up of code
* Updating trailer.window to be more accurate estimate of time left in window