Applied new code format