-removed redundancy
-fixed modifier reference