Block matching settings class refactored