reduce duplication
release 0.4.1