Changed code format