Clean design

by Tom Slobodyanyuk