Added comments, formatted comments