Cleaned up server setup code