atg. cleanup/refactor to privatize non-public fields