#660 - further cleanup
#660 - clean up, correct initialization