formatting
more fixes