clean up + modifications