Formatting

Continued development