Did badly needed code format