celan up the code