Code clean-up via ReSharper
Renamed private and public members for consistency with my other libraries

Also:
- Further code clean-up
- Marked TODOs in the code
- Fixed comments