A few cleanups, plus, warm up is in seperate class.