Code improvement - 1;