code format & add case