Refactoring
Fixed some cleanup regex