code cleanup more commits