Rubocop comments addressed.

Fixed any issues found during testing and cleanup, found some issues because of the PR that was merged right before this PR to remove @record from session object.

Issue #105