Indentation and minor changes/fixes regarding code standards.