Fix Conversion (+Clean up some indents)
Merge pull request #1286 from Fuzzysqurl/master

Fix Conversion