Updated rubocop config and updated files to fit style guide