Formatting

Hopefully should make the formatting nicer