some cleaning, prints for debugs