Fix Conversion (+Clean up some indents)