Inmproved code format