(refactor) Cleaning up code
Merge pull request #80 from phoenix16t/refactor/server

(refactor) Cleaning up code