cleanup: code cleanup