Minor code formatting improvements