Some more formatting

.smx will come next commit, hopefully.