tweaked design for clean
Release 0.2.4