Init fix and cleanup

Fixes the overlooked init change.
Split out messageHandlers.