streamlined code
Merge pull request #3 from nettux443/streamline

Merge streamlined code