Further code cleanup
Merge branch 'master' of github.com:radialpoint/ringo into objective-ddp