[#301] Code cleanup