work:ran thru lint, corrected errors