Variable cleanup.
Cleanup of comments and moved member variables last in header.
Removed unnecessary member variables and cleaned up naming and includes.
Cleanup of variable names and includes.
Cleanup of comments.