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

Rubocop code improvements
Fix current port update
Merge pull request #20 from Xenapto/develop

Fix current port update