incorporated MedO-suggested plugins code refactor