Refactoring
Fixed graph