Cleaned client code