further refinements

Signed-off-by: Levi Tan Ong <levi@byimplication.com>