systematize eval
better duplicate code
format
update todo