removed some slight redundancy