Small formatting changes
Rewrite to use khepri packages