Fixed a PHP Strict standards warning.
Fixed overhead of retrieving an option by moving the retrieval to the callback method.
- Removed redundant lines.