Cleaned up with Rubocop. Less than 10 issues.