Support for disabling before; coding style; logging adjustments