Added server-side Timer (XForce)
Cleaned up some code (XForce)