cleaning up with 'mode' naming issue