removed trash, made everything more consistent...