Fix some random new line and spacing issues