Fix indentation.
Add some more platform independence.

* nods to harry *