Updated comments, some formatting