Cleaning up. Following Rubocop suggestions.