refactoring, revised diagram and docs
reduced diagram size