modernize code
update formatting
Modernize code