Slightly cleaned up the design
Merge branch 'cleandesign'