refactor and rubocop
Merge pull request #13 from sotoseattle/master

refactor and rubocop