Updated code formating