code formatting improvements