better v2 defaults handling
Global cleanup & consistency refactor