Added labelling comments, fixed formatting and removed unused rules