style and commenting updates