Code: Formatting and minor improvements.