Added Parenthesis to Boolean Expression, and removed some commented code to clean it up.