Fix offences based on rubocop