Refactor code and update dependencies in various files #544

Closed lalalaurentiu closed 5 months ago