Refactoring ahoy! Tested in Java 8. Nothing broken! Still compiles in Java 6… I think…