removed more double arithmetic