Fix code formatting and notification format