Code format reviewed