better code structure in dump