grooming and information hiding
fix merge
Merge pull request #6 from paypal/grooming

grooming and information hiding