a little clean up and logic ux