JavaDoc change, simplify statements