[#65] code cleanup