added todo and cleaned up main