testing
testing
testing
testing
testing
testing
testing
testing
testing
testing
Merge pull request #252 from Danny-Hazelcast/cleanup

Cleanup, rename, todos