Cleaned up code.

Deleted a lot of unnecessary code, and standardized a lot of stylistic tendencies across classes.