Cleaned up self references