Fix whitespaces when applying and enable rerere