Modernize code

2 jobs for master