small code improvements
preparation for version 0.4.3