standards clean up, use unless instead of if not