Code cleanup
Overlap right_text