Cleaned up some refs