Small optimizations and refactorings. Removing FunctionalJava