MSE-3 : Refactor Server Class