Add headers and fix rubocop issues