Little refactor Server