Refactor

Refactor crufty code and update for 2.6 server logs