Renamed a few things.
Removed junk.