Cleanup formatting a bit and add in project name