Cleaning up client code