Cleaning

Clean some code like `if foo == True`, etc.