[Client] Minor code cleanup