Made indentation and code style more uniform.