some cleaning ^^