code style and various tweaks
0.4.0