Micro refactoring #351

Closed jose-antonio-torres closed 4 months ago