Did stuff Matt asked for
Formatting