Hazelcast checkpoint service +some code clean up