Another code improvements