reformat
removed usage of deprecated code