Refactor sttd_server module according to review