[#59] fist pass fixing following @parasyte comments