Fix warning
Slight reorganization
Remove redundant diagram