Some code cleanup. By default no verbose output.