Clean code to follow Rubocop style guide
Merge with master
Merge pull request #19 from contentful/code_clean_up

Clean code to follow Rubocop style guide.