Fixed last formatting and inspection issues.