minor code style updates and making Server call EventEmitter's constructor