Applying bishwa's valuable comments :)