Only add new server when the last one is empty

Also fixes some coding standards issues in the last couple of commits.
=)