Code improvement - 4;