Add stub client class; reformat code