Code Review Feedback

Fixed the USER/PASS that I missed in last review
Converted from Scanner module to Gather