change: style fix & get rid of useless code