Formatting update

Fixed various formatting issues, such as lines exceeding 80 characters,
improper indentation, etc.