fix: address code review findings across backend and frontend
CI / test (pull_request) Successful in 2m13s