Various cleanups. (Meaning I lost track of what I changed)