Another code improvements.