Fix some formatting.
Fix filename requirement issue.