This commit contains several style related updates: - aligns class parameters for readibility - removes trailing class params for 2.6.x compat - deletes accidentally checked in swp file