get rid of some yellow code
use equals for primitive types because of annotations for Java 8