typo fix, cleanup