cleanup more code