Fix: Helper dump method
Fix: Style fixes