(refactor) Reduce server code lines to 80 chars