*some cleaning