Small placement fixes and comments.

Change some variables to be method only.
Remove unused variables.
Move comments
Fix Constructor to use non-deprecated version.