code cleaning
Merge pull request #3 from nyjt/code_cleaning

code cleaning