pivotal: simplify code