code clean up
added special characters handling