Tidy ServerFrame.
Merge pull request #173 from greboid/tidying

Tidy ServerFrame.