Added comments, changed format