Helical cut

Could someone help me refine my model.  If you look at corner where the cut lip ends you will notice undercuts.  How can I improve my cut to get rid of this.

Secondly I need to put a bevel at 60 degrees on the red highlighted face.  Thanks

SolidworksParts And Features