Removed unnecessary member variables and cleaned up naming and includes.
Cleanup of variable names and includes.
Cleanup of comments.