Clean up naming and comments
Fix a typo