Messaging improvements and code standard compliance updates