Fix formatting
Refactored ServerTask out
major refactor