Format code
Simplify code