Refactor code and update dependencies in various files #545

Closed lalalaurentiu closed 2 months ago