some code clean up while reading thru
Merge pull request #1 from fauverism/master

some code clean up while reading thru