Got rid of some confusing tidbits