Code refactoring after cmin sugestions.