marginally clean up code; no real change to features