Cleaned up many references