WIP - update style based on rubocop