Finished cleaning up client code