Cleaning up ambiguous variable names. Cleaning up warnings.