Minor improvments after Rubocop