Cleanup
Cleanup
Refactor gensym