Code improvement - 2;