code smell fixes
Merge branch 'master' of https://github.com/aureooms/sake