code rearrangement
Merge pull request #136 from ping19/master

code rearrangement