cleaned some up