simplify & code style