a bit more and some cleaning