Modernize
Run more checks