Warnings. Сode cleanup