Slightly Refactor Defaults