Comments handler fixed, clean directory