#81 - fixed event.readBinary() causes UnsupportedOperationException
#81 - tidy code