Reorganized

clean up, realized pemdas already inplace, going to override