removed pending todos
code formatting