Use Proc.new.call where possible
Fix rubocop issues