Removed some unecessary method args
Combined this.active and this.activeItem