Cleaned a bunch of stuff up