Cleaned up a ton of stuff