Mostly code formatting