Remove fixed TODO coment
Fix visibility of method