Cleaning up dev console.logs and `handleConnection` size