Fixed visibility in Basic_calc
Made some small changes to variable names