Indentation cleanup.
Added architecture detection.