Applied to some comments; trying to make plugin more versatile and readable