escaped option fix
Code cleanup