removed some unnecessery namespace qualifiers