fix: resolve all 15 /code-review findings (#36)

fix: resolve all 15 /code-review findings (#36) #27