Rubocop code improvements
Merge pull request #18 from Xenapto/chore/rubocop

Rubocop code improvements