Code refactoring #40

Merged
kdeng00 merged 2 commits from changes into master 2025-03-25 22:14:26 -04:00