Streamlined to applyTo and removeFrom methods.
Various refactoring