Some DRY cleaning and default behavior changed