[#62820480] cleaning up code