Fixed formatting, etc.