Design improvement

Or at least I tried.