Some refactoring in the client code
Comments