Fixes the overlooked init change.
Split out messageHandlers.
Merge pull request #8 from tomitm/fix-init-cleanup

Init fix and cleanup