Include rather than extend, fix rubocop issues