cleaning and TODO reference