Shortened dump methods

More concise, flexible code, but a bit complex. Not tested.