brought avocado module in line with java 8 coding conventions