Style cleanup and commenting