simplify interfaces normalize code

simplify interfaces normalize code