Splited some long argument lists to the multiple lines.
Various style corrections.