Formatting fixes.
Remove additional criteria for now.