Add missing minus sign and line up factors for easy readability