Cleaned up server.go