some cleaning in package class