style changes and commenting