Cleaned up checkstyle xml
Fixed a regex