minor: cleanup + extended sample usage