updated project code clean up and formatting