minor cleanup of rewriters
updated regex to fixed failing test
suppressed checkstyle on Java 8 syntax for now
Merge pull request #1076 from yilongli/minor-cleanup-of-rewriter

minor cleanup of rewriters