Marki - cleaning code