some cleaning in source