Correct all Boolean not needed -> boolean is enough