Minor fix of pull request issues.
Imports.
Some comments are re-written.
Some conditions are refactored.
Duplicate effector notations are removed.