Fix code formatting issues with original source