code cleanup: