[#312] Code cleanup