Fixed indentation and various improvements.
Fixed indentation and various improvements.