code cleanup -jx