Refactored client/server to improve feedback to the user