more cleaning
Merge pull request #53 from hzla00/newken

more cleaning