Default optimize

Verify if you agree with these optimizations.