small refactors
dump version 0.4.1