Refactoring + general improvements for Feature enhancement milestone #98

Closed athrael-soju closed 1 year ago