Design cleanup
Merge pull request #368 from nicozanf/patch-1

Design cleanup