Refixing indentation, adding option to force proper regex form