[#150] cleaning up the code.