change to new style object and code formating