Use of NSPredicate, relocation unified into 'update comments', relocation position fix, clean code