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