Optimize
BUG: fix parenthesis