[#20] cleanup fixes