Updated comments and style.