Clean up use of the storing and messaging boolean fields