atg. refactor/cleanup.