misc code refactoring
Merge branch 'master' of ssh://git@github.com/xSAVIKx/rabbit.git