Change defaults, fix indentation