imporve methods comments
add TODO task