Fixing comments, whitespaces, and array identation;