Refactoring, inspection
Java 1.8