Indentation Changed

Changed Indentation according to the Code Conventions document
Indentation

More indentation corrections
Indentation