Address todo comments from refactoring