Implemented behavior removal. Refactored, too.
Refactored code.