SPARK-1438 fixing more space formatting issues