removed todos, used tuple unpacking