Refactor: No any warnings