Simplify hooks and improve messages