commenting and some cleaning