simplify statements

Simplify some of the statements