Code clean up using Java 8 improved type inference