Many formatting fixes