fixed: refactored + reflected comments in PR