Cleaned up warnings from rubocop