Modernize code
Fix indentations