perf(client): tweak perf
style: cleanup & simplify code