minor refactor
preparing plugin to use more callbacks via final modifiers