Minor change
Refactor
Refactor server