Better style, format fixes.