added todo format
editing
working on code readability