Add validation on authkey
Resolve conflicts
Fix jshint issue
Inline argument validation and processing (prevents jshint issue)