Minor clean and TODO's