Refactor code and update dependencies in various files #547

Closed lalalaurentiu closed 1 month ago