Reduce verbosity and make things optimized