removed trailing conditional