Adjusted unaligned comments and default arguments.