refactoring
fixed servant logic