Remove all tailing spaces
Change CPP types ADT to a unified type