A little whitespace cleanup
Correct complex conversions