Fix Some More Format.
Merge pull request #457 from alexbegt/master

Fix Some More Format.