code cleanup (Phase II)
Code cleanup (Phase III)