Fix some formatting
More updates
Further updates
Further updates
Further updates