Many changes
Formatting