Reindent files
Fix some errors and update regex objects creation
Fix regex