Fixed error msg output
Removes unused 'token' option
Remove unused variables
Fixed conflicting local and global variable name useage
Merge pull request #14 from davidvossel/more_cleanup

various cleanup