[cleanup] Refactored defaults (Part 1)