Refactorings to Hazelcast code