Code cleanup. Make less verbose by default.