DEV1.1 - code formatted