Improve source formatting
Improve source formatting and improve formatting