much better code org