Communication improvements and clean-up