Code improvement - 3;