- Cleaned up some things