Style cleanup and added git note