style tweaks, see #33
finshing tweaking according to #33, closing