formatting
some cleaning