MinorGeneralCleanup removed newlines and renamed parameters