cleaned up
Merge pull request #64 from yatsdev/cleanup

cleaned up