Slight client refactor.