Code review updates
Merge pull request #12 from borkweb/waterfall-redesign

Code review updates