Added comments and removed unused code, still missing labels