Code clearing, small fixes
Merge pull request #111 from ping19/master

Code clearing, small fixes