Style suggestions from HLint
Make sure the cleanup functions are behaving
Make sure all sent messages are received