try to clean up if syntax