adding flattener/rubocop changes