style and format fixes.