[#839] Code cleanup