simplify or adjust some items

according to someones’ feedback