Fix typo
Remove redundant code
Fix class names
Simplify getting object references from the arguments hash
Update gem version