standardizing use statements and altering some comments