organize code differently.  matuzi style.