More paranthesis and removed redundant code.