Some cleaning and TODO file