Usage notes
Fix typo in note
Address unused items found by Eclipse