Spec and code improvements with Rubocop