[#8] Small fixes to the code after review