Changed indentation and regexes.