Formatting fix
Optimization