Fix some formatting and tabs