Cleaned up some stuff.