cleanup code & adhere to conventions
ZDS++