Remove redundant macro, and add some typedef