Small Code and Doc Cleanup
Small Corrections