Address Rubocop issues
Adhere to to Rubocop's standards