Revised style and commenting