Switched to decorator style receiver connection
Cleaned up logging code