[TASK] Change code to minimize warnings