Cleaned up friend in headers