reduce clutter and update some rules