Code cleanup

To improve my understanding of the library before implementing amqp 0.9.1 support, I've taken the liberty to clean up the code a bit. There are no changes to the interface or the underlying model, I've only fixed all warnings and improved readability at some points.